bitkeeper revision 1.1159.1.337 (4187c1ce5397aQbAhDCeojMJeJsAzw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/local/scratch/kaf24/xeno

diff --cc BitKeeper/etc/ignore
index 6f44ed830749c94611401911a329cd40441f28ba,169bc9a529bbd7205f162fa010a31602b6f56421..50dbe38b24416620ec795cc298f8c222ab1572a1
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -10,22 -10,21 +10,42 @@@
  BitKeeper/*/*
  PENDING/*
  TAGS
--Twisted-1.3.0/*
  Twisted-1.3.0.tar.gz
++Twisted-1.3.0/*
  docs/*.aux
  docs/*.dvi
  docs/*.log
  docs/*.pdf
  docs/*.ps
  docs/*.toc
 +docs/figs/xenserver.eps
  docs/html/*
--docs/ps/*
++docs/interface/WARNINGS
++docs/interface/images.pl
++docs/interface/images.tex
++docs/interface/img1.png
++docs/interface/index.html
++docs/interface/interface.css
++docs/interface/interface.html
++docs/interface/labels.pl
  docs/pdf/*
++docs/ps/*
++docs/user/WARNINGS
++docs/user/images.pl
++docs/user/images.tex
++docs/user/img1.png
++docs/user/img2.png
++docs/user/img3.png
++docs/user/index.html
++docs/user/internals.pl
++docs/user/labels.pl
++docs/user/user.css
++docs/user/user.html
  extras/mini-os/h/hypervisor-ifs
  install/*
  linux-*-xen0/*
  linux-*-xenU/*
++linux-xen-sparse
  netbsd-*-tools/*
  netbsd-*-xen0/*
  netbsd-*-xenU/*